diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c
index 34119f9..280d96d 100644
--- a/drivers/mmc/renesas-sdhi.c
+++ b/drivers/mmc/renesas-sdhi.c
@@ -843,6 +843,7 @@
 	{ .compatible = "renesas,sdhi-r8a77970", .data = RENESAS_GEN3_QUIRKS },
 	{ .compatible = "renesas,sdhi-r8a77990", .data = RENESAS_GEN3_QUIRKS },
 	{ .compatible = "renesas,sdhi-r8a77995", .data = RENESAS_GEN3_QUIRKS },
+	{ .compatible = "renesas,rcar-gen4-sdhi", .data = RENESAS_GEN3_QUIRKS },
 	{ /* sentinel */ }
 };
 
diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c
index d8b6a4a..8d7ee48 100644
--- a/drivers/mmc/tmio-common.c
+++ b/drivers/mmc/tmio-common.c
@@ -369,7 +369,7 @@
 	if (!IS_ALIGNED(addr, TMIO_SD_DMA_MINALIGN))
 		return false;
 
-	if (IS_ENABLED(CONFIG_RCAR_GEN3)) {
+	if (IS_ENABLED(CONFIG_RCAR_64)) {
 		if (!(data->flags & MMC_DATA_READ) && !IS_ALIGNED(addr, 128))
 			return false;
 		/* Gen3 DMA has 32bit limit */